remove an unused variable and cast accel_path to gchar, just like in

2008-06-19  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtkmenuitem.c: remove an unused variable and cast
    accel_path to gchar, just like in gtkmenu.c

svn path=/trunk/; revision=20473

diff --git a/ChangeLog b/ChangeLog
index 01019bb0b126835e4568eaa425152cca31747724..3f818b5c0e7da65cd4b09874e3455efca566fd02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-19  Johan Dahlin  <jdahlin@async.com.br>
+
+       * gtk/gtkmenuitem.c: remove an unused variable and cast
+       accel_path to gchar, just like in gtkmenu.c
+
 2008-06-19  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkrecentmanager.c (get_icon_for_mime_type): Use GIO

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 73f1f17a983ec68672f9e13ef5b33b02fb0798dd..aa2b27ad1ae2730b84b684a3d7c9bb5f2a12634b 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -1565,7 +1565,7 @@ _gtk_menu_item_refresh_accel_path (GtkMenuItem   *menu_item,
           if (postfix)
             {
               new_path = g_strconcat (prefix, "/", postfix, NULL);
-              path = menu_item->accel_path = g_intern_string (new_path);
+              path = menu_item->accel_path = (char*)g_intern_string (new_path);
               g_free (new_path);
             }
        }
@@ -1606,7 +1606,6 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
                              const gchar *accel_path)
 {
   GtkWidget *widget;
-  gchar *old_accel_path;
 
   g_return_if_fail (GTK_IS_MENU_ITEM (menu_item));
   g_return_if_fail (accel_path == NULL ||
@@ -1615,7 +1614,7 @@ gtk_menu_item_set_accel_path (GtkMenuItem *menu_item,
   widget = GTK_WIDGET (menu_item);
 
   /* store new path */
-  menu_item->accel_path = g_intern_string (accel_path);
+  menu_item->accel_path = (char*)g_intern_string (accel_path);
 
   /* forget accelerators associated with old path */
   gtk_widget_set_accel_path (widget, NULL, NULL);